Wed Jan 26 12:23:12 1994 Frederic Pierresteguy (fp@mole.gnu.ai.mit.edu)

	* xdisp.c (update_menu_bar): Add USE_X_TOOLKIT conditional and test
	FRAME_EXTERNAL_MENU_BAR.

diff --git a/src/xdisp.c b/src/xdisp.c
index c2a492ecbc03714cf39638db563b4f0ffcea6492..2dbbbabb0d09c045f95bef94c62ae9d87c8333dd 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -946,7 +946,11 @@ update_menu_bar (window, just_this_one)
 
   /* When we reach a frame's selected window, redo the frame's menu bar.  */
   if (!NILP (w->update_mode_line)
+#ifdef USE_X_TOOLKIT
+      && FRAME_EXTERNAL_MENU_BAR (f) 
+#else
       && FRAME_MENU_BAR_LINES (f) > 0
+#endif
       && EQ (FRAME_SELECTED_WINDOW (f), window))
     {
       /* If the user has switched buffers or windows, we need to